Merge branch 'master' of https://github.com/Victor-Savu/cargo into update
authorAlex Crichton <alex@alexcrichton.com>
Mon, 9 Mar 2015 18:13:32 +0000 (11:13 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 9 Mar 2015 18:13:32 +0000 (11:13 -0700)

Trivial merge